From ea097260f7c9c2c09694000c5a751dc579ec0fac Mon Sep 17 00:00:00 2001 From: Jeroen van der Heijden Date: Fri, 24 Jan 2020 14:41:03 +0100 Subject: [PATCH] Update for test --- src/siri/db/db.c | 2 +- src/siri/db/tee.c | 10 ++++++---- src/siri/heartbeat.c | 2 +- src/siri/siri.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/siri/db/db.c b/src/siri/db/db.c index d9d1425e..2b94f668 100644 --- a/src/siri/db/db.c +++ b/src/siri/db/db.c @@ -273,7 +273,7 @@ siridb_t * siridb_new(const char * dbpath, int lock_flags) /* init tee if configured */ if (siridb_tee_is_configured(siridb->tee)) { - siridb_tee_connect(siridb->tee); + // siridb_tee_connect(siridb->tee); } log_info("Finished loading database: '%s'", siridb->dbname); diff --git a/src/siri/db/tee.c b/src/siri/db/tee.c index 51f87668..5eafa84d 100644 --- a/src/siri/db/tee.c +++ b/src/siri/db/tee.c @@ -145,10 +145,10 @@ static void tee__runtime_init(uv_pipe_t * pipe) tee->flags &= ~SIRIDB_TEE_FLAG_INIT; tee->flags &= ~SIRIDB_TEE_FLAG_CONNECTED; - if (siridb_tee_connect(tee)) - { - log_error("Could not connect to tee at runtime"); - } + // if (siridb_tee_connect(tee)) + // { + // log_error("Could not connect to tee at runtime"); + // } } static void tee__close_cb(uv_pipe_t * pipe) @@ -193,6 +193,8 @@ static void tee__on_connect(uv_connect_t * req, int status) } free(tee->err_msg_); + tee->err_msg_ = NULL; + if (asprintf( &tee->err_msg_, "Cannot connect to pipe '%s' (%s)", diff --git a/src/siri/heartbeat.c b/src/siri/heartbeat.c index 06011e17..0815950e 100644 --- a/src/siri/heartbeat.c +++ b/src/siri/heartbeat.c @@ -64,7 +64,7 @@ static void HEARTBEAT_cb(uv_timer_t * handle __attribute__((unused))) if ( siridb_tee_is_configured(siridb->tee) && !siridb_tee_is_connected(siridb->tee)) { - siridb_tee_connect(siridb->tee); + // siridb_tee_connect(siridb->tee); } server_node = siridb->servers->first; diff --git a/src/siri/siri.c b/src/siri/siri.c index ffeb1907..8630d2a2 100644 --- a/src/siri/siri.c +++ b/src/siri/siri.c @@ -563,5 +563,5 @@ static void SIRI_close_handlers(void) uv_walk(siri.loop, SIRI_walk_close_handlers, NULL); /* run the loop once more so call-backs on uv_close() can run */ - uv_run(siri.loop, UV_RUN_ONCE); + uv_run(siri.loop, UV_RUN_NOWAIT); } -- 2.30.2